build: Fix post-install script
authorEmmanuele Bassi <ebassi@gnome.org>
Mon, 14 Aug 2017 21:29:44 +0000 (22:29 +0100)
committerEmmanuele Bassi <ebassi@gnome.org>
Mon, 14 Aug 2017 21:31:13 +0000 (22:31 +0100)
Use the appropriate variable when expanding the input method modules
path.

build-aux/meson/post-install.sh
meson.build

index a59d7d5c66552f213eaf5613afc91c21a7f1fe77..c7390fae9b14d879c8e1393d3adb82529f56944b 100755 (executable)
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-gtk_version=$1
+gtk_api_version=$1
 gtk_abi_version=$2
 gtk_libdir=$3
 gtk_datadir=$4
@@ -17,5 +17,5 @@ if [ -z "$DESTDIR" ]; then
   gtk-update-icon-cache -q -t -f ${gtk_datadir}/icons/hicolor
 
   echo Updating input method modules cache...
-  gtk4-query-immodules > ${gtk_libdir}/gtk-${version}/${gtk_abi_version}/immodules.cache
+  gtk4-query-immodules > ${gtk_libdir}/gtk-${gtk_api_version}/${gtk_abi_version}/immodules.cache
 fi
index 53800f8243065a20f80071e84be76ee60fb0928f..8fd666512d3d38f6e2b4c2da10e1c890e05d365e 100644 (file)
@@ -601,7 +601,7 @@ endif
 
 # Keep this in sync with post-install.sh expected arguments
 meson.add_install_script('build-aux/meson/post-install.sh',
-                         gtk_version,
+                         gtk_api_version,
                          gtk_binary_version,
                          gtk_libdir,
                          gtk_datadir)